From: Eli Zaretskii <eliz@gnu.org>
Date: Sat, 18 Jul 2009 11:59:04 +0000 (+0000)
Subject: *** empty log message ***
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~324^2~11418
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=36c815474ff957ce300eade0ed17bce046f1914c;p=emacs.git

*** empty log message ***
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2849d3639ac..00e8e0bf598 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,14 @@
 2009-07-18  Eli Zaretskii  <eliz@gnu.org>
 
+	* desktop.el (desktop-buffers-not-to-save): Default value is nil.
+	Accept nil in addition to a regexp.
+	(desktop-files-not-to-save): Add "(ftp)$" to the default regexp.
+	Accept nil in addition to a regexp.
+	(desktop-save-buffer-p): Don't use desktop-buffers-not-to-save for
+	buffers that have an associated file.  Handle nil values of
+	desktop-buffers-not-to-save and desktop-files-not-to-save.
+	(Bug#3833)
+
 	* term/pc-win.el (x-selection-owner-p, x-own-selection-internal)
 	(x-disown-selection-internal): New functions.